Check for libxml2 if security tools are to be built, and adapt the

python setup.py command line parameters to also work under SuSE.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/Makefile b/tools/Makefile
index c150dbd984b9e0ae9f631c1fc602d525e7be80be..18205ccca825838296bc45ba17476d3f5bd8fae3 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,7 +10,7 @@ SUBDIRS-y += examples
 SUBDIRS-y += xentrace
 SUBDIRS-$(CONFIG_XCUTILS) += xcutils
 SUBDIRS-$(CONFIG_X86) += firmware
-SUBDIRS-y += security
+SUBDIRS-$(ACM_SECURITY) += security
 SUBDIRS-y += console
 SUBDIRS-y += xenmon
 SUBDIRS-y += guest-headers

diff --git a/tools/check/Makefile b/tools/check/Makefile
index 98f125f04801add3596be9933e392e4cff04f86f..abba3d6ab7e7355183814d855034514d6d7b6e5f 100644 (file)
--- a/tools/check/Makefile
+++ b/tools/check/Makefile
@@ -7,7 +7,7 @@ all: build
 # Check this machine is OK for building on.
 .PHONY: build
 build:
-       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk build
+       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk build
 
 # Check this machine is OK for installing on.
 # DO NOT use this check from 'make install' in the parent
@@ -15,7 +15,7 @@ build:
 # copy rather than actually installing.
 .PHONY: install
 install:
-       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk install
+       XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk install
 
 .PHONY: clean
 clean:

diff --git a/tools/check/check_xml2 b/tools/check/check_xml2
index 782feda39eb65cd4ede710b475ba365a2056f90f..e8def042ad7be200b24d9b61221f5efb4ff63d90 100755 (executable)
--- a/tools/check/check_xml2
+++ b/tools/check/check_xml2
@@ -1,7 +1,7 @@
 #!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
-if [ ! "$LIBXENAPI_BINDINGS" = "y" ]
+if [ ! "$LIBXENAPI_BINDINGS" = "y" -a ! "$ACM_SECURITY" = "y" ]
 then
     echo -n "unused, "
     exit 0

diff --git a/tools/security/Makefile b/tools/security/Makefile
index b31ad41ca72accae969fc690204408bdd5fa6be3..4a193596d25bcfda8ac9470d0c19f0dffbad142c 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -66,7 +66,7 @@ install: all $(ACM_CONFIG_FILE)
        $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
        $(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
 ifndef XEN_PYTHON_NATIVE_INSTALL
-       python python/setup.py install --home="$(DESTDIR)/usr" --install-lib="$(DESTDIR)$(LIBPATH)/python"
+       python python/setup.py install --install-lib="$(DESTDIR)$(LIBPATH)/python"
 else
        python python/setup.py install --root="$(DESTDIR)"
 endif